Rename module garmin_poi. New name is now garmin_gpi.

diff --git a/Makefile.in b/Makefile.in
index 479801a099a0765f0a48e5e593524dd764312fbd..3f6fcae2d6f3a36681e1ac3813b77b380135878d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,7 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \
        ignrando.o stmwpp.o msroute.o cst.o nmn4.o mag_pdb.o compegps.o \
        yahoo.o unicsv.o wfff_xml.o garmin_txt.o axim_gpb.o gpssim.o \
        wbt-200.o stmsdf.o gtrnctr.o dmtlog.o raymarine.o alan.o vitovtt.o \
-       ggv_log.o g7towin.o garmin_poi.o
+       ggv_log.o g7towin.o garmin_gpi.o
 
 FILTERS=position.o radius.o duplicate.o arcdist.o polygon.o smplrout.o \
        reverse_route.o sort.o stackfilter.o trackfilter.o discard.o \
@@ -413,7 +413,7 @@ garmin_fs.o: garmin_fs.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \
   jeeps/gpsproj.h garmin_tables.h
-garmin_poi.o: garmin_poi.c garmin_poi.h defs.h config.h queue.h gbtypes.h \
+garmin_gpi.o: garmin_gpi.c garmin_gpi.h defs.h config.h queue.h gbtypes.h \
   cet_util.h jeeps/gpsmath.h
 garmin_tables.o: garmin_tables.c garmin_tables.h defs.h config.h queue.h \
   gbtypes.h zlib/zlib.h zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h \

diff --git a/garmin_gpi.c b/garmin_gpi.c
index 30acc74aacc95024701ce4d02de1ba99e9d3316b..573fb6aa304a67dff456ca5c0f9dfb03d33f6cf7 100644 (file)
--- a/garmin_gpi.c
+++ b/garmin_gpi.c
@@ -36,13 +36,13 @@
 #include "defs.h"
 #include "cet_util.h"
 #include "jeeps/gpsmath.h"
-#include "garmin_poi.h"
+#include "garmin_gpi.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 
-#define MYNAME "garmin_poi"
+#define MYNAME "garmin_gpi"
 
 #define GPI_DBG 1
 #undef GPI_DBG
@@ -51,7 +51,7 @@
 
 static char *opt_cat, *opt_pos, *opt_notes, *opt_hide, *opt_descr;
 
-static arglist_t garmin_poi_args[] = {
+static arglist_t garmin_gpi_args[] = {
        {"category", &opt_cat, "Default category on output", 
                "My points", ARGTYPE_STRING, ARG_NOMINMAX},
        {"hide", &opt_hide, "Don't show gpi bitmap on device", 
@@ -679,7 +679,7 @@ write_data(const char *group)
 *******************************************************************************/
 
 static void
-garmin_poi_rd_init(const char *fname)
+garmin_gpi_rd_init(const char *fname)
 {
        char cp[8];
        
@@ -697,7 +697,7 @@ garmin_poi_rd_init(const char *fname)
 
 
 static void
-garmin_poi_wr_init(const char *fname)
+garmin_gpi_wr_init(const char *fname)
 {
        char cp[8];
        cet_cs_vec_t *vec;
@@ -738,7 +738,7 @@ garmin_poi_wr_init(const char *fname)
 
 
 static void 
-garmin_poi_rd_deinit(void)
+garmin_gpi_rd_deinit(void)
 {
        if (dt->category) xfree(dt->category);
        if (dt->group) xfree(dt->group);
@@ -748,7 +748,7 @@ garmin_poi_rd_deinit(void)
 
 
 static void 
-garmin_poi_wr_deinit(void)
+garmin_gpi_wr_deinit(void)
 {
        queue *elem, *tmp;
        
@@ -762,20 +762,20 @@ garmin_poi_wr_deinit(void)
 
 
 static void
-garmin_poi_read(void)
+garmin_gpi_read(void)
 {
        while (! gbfeof(fin)) { /* main loop */
                int tag;
                
                tag = gbfgetint32(fin);
                if ((tag == 0xffff) || (tag == 0xff)) return;
-               if (! read_tag("garmin_poi_read", tag, NULL)) return;
+               if (! read_tag("garmin_gpi_read", tag, NULL)) return;
        };
 }
 
 
 static void
-garmin_poi_write(void)
+garmin_gpi_write(void)
 {
        if (strlen(opt_cat) == 0) fatal(MYNAME ": Can't write empty category!\n");
        
@@ -788,21 +788,21 @@ garmin_poi_write(void)
 
 /**************************************************************************/
 
-ff_vecs_t garmin_poi_vecs = {
+ff_vecs_t garmin_gpi_vecs = {
        ff_type_file,
        { 
                ff_cap_read | ff_cap_write      /* waypoints */, 
                ff_cap_none                     /* tracks */, 
                ff_cap_none                     /* routes */
        },
-       garmin_poi_rd_init,     
-       garmin_poi_wr_init,
-       garmin_poi_rd_deinit,   
-       garmin_poi_wr_deinit,
-       garmin_poi_read,
-       garmin_poi_write,
+       garmin_gpi_rd_init,     
+       garmin_gpi_wr_init,
+       garmin_gpi_rd_deinit,   
+       garmin_gpi_wr_deinit,
+       garmin_gpi_read,
+       garmin_gpi_write,
        NULL,
-       garmin_poi_args,
+       garmin_gpi_args,
        CET_CHARSET_MS_ANSI, 0          /* WIN-CP1252 */
 };
 

diff --git a/garmin_gpi.h b/garmin_gpi.h
index 1811cc84d220fca0d17dcb8982cce5e91ffca626..9fe604d06eee1b411d7409d0566d8179d2347a47 100644 (file)
--- a/garmin_gpi.h
+++ b/garmin_gpi.h
@@ -1,5 +1,5 @@
-#ifndef GARMIN_POI_H
-#define GARMIN_POI_H
+#ifndef GARMIN_GPI_H
+#define GARMIN_GPI_H
 
 static char gpi_bitmap[] = {
        0x00,0x00,0x18,0x00,0x18,0x00,0x18,0x00,0x08,0x00,0x00,0x00,0x40,0x02,0x00,0x00,

diff --git a/reference/garmin_gpi.gpi b/reference/garmin_gpi.gpi
new file mode 100644 (file)
index 0000000..290d892
Binary files /dev/null and b/reference/garmin_gpi.gpi differ

diff --git a/reference/garmin_gpi.gpx b/reference/garmin_gpi.gpx
new file mode 100644 (file)
index 0000000..2424b5d
--- /dev/null
+++ b/reference/garmin_gpi.gpx
@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx
+ version="1.0"
+creator="GPSBabel - http://www.gpsbabel.org"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.topografix.com/GPX/1/0"
+xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
+<time>1970-01-01T00:00:00Z</time>
+<bounds minlat="42.401050944" minlon="-71.126601985" maxlat="42.468654849" maxlon="-71.102972981"/>
+<wpt lat="42.439992931" lon="-71.120924922">
+  <name>5058ROAD</name>
+  <cmt>ROAD CROSSING</cmt>
+  <desc>ROAD CROSSING</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.438877970" lon="-71.119276956">
+  <name>5066</name>
+  <cmt>5066</cmt>
+  <desc>5066</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.439226909" lon="-71.119688759">
+  <name>5067</name>
+  <cmt>5067</cmt>
+  <desc>5067</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.438916946" lon="-71.116145980">
+  <name>5096</name>
+  <cmt>5096</cmt>
+  <desc>5096</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.443903927" lon="-71.122043990">
+  <name>5142</name>
+  <cmt>5142</cmt>
+  <desc>5142</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.445358858" lon="-71.122844797">
+  <name>5144SUMMIT</name>
+  <cmt>Summit</cmt>
+  <desc>Summit</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.449764973" lon="-71.122319922">
+  <name>5148NANEPA</name>
+  <cmt>Nanepashemet Road Crossing</cmt>
+  <desc>Nanepashemet Road Crossing</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.441726979" lon="-71.121675773">
+  <name>5150TANK</name>
+  <cmt>WATER TANK</cmt>
+  <desc>WATER TANK</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.447297927" lon="-71.121446947">
+  <name>5156</name>
+  <cmt>5156</cmt>
+  <desc>5156</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.449865891" lon="-71.119297827">
+  <name>5179DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.454872821" lon="-71.125093997">
+  <name>5224</name>
+  <cmt>5224</cmt>
+  <desc>5224</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459078860" lon="-71.124987882">
+  <name>5229</name>
+  <cmt>5229</cmt>
+  <desc>5229</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.456468903" lon="-71.124650761">
+  <name>5236BRIDGE</name>
+  <cmt>Bridge</cmt>
+  <desc>Bridge</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.456978858" lon="-71.124473820">
+  <name>5237</name>
+  <cmt>5237</cmt>
+  <desc>5237</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459277930" lon="-71.124573816">
+  <name>5239ROAD</name>
+  <cmt>Road</cmt>
+  <desc>Road</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.453255868" lon="-71.121210828">
+  <name>5252PURPLE</name>
+  <cmt>Purple Rock Hill</cmt>
+  <desc>Purple Rock Hill</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.454400836" lon="-71.120989798">
+  <name>5254</name>
+  <cmt>5254</cmt>
+  <desc>5254</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.451441940" lon="-71.121745761">
+  <name>5258</name>
+  <cmt>5258</cmt>
+  <desc>5258</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.454403937" lon="-71.120659970">
+  <name>5264</name>
+  <cmt>5264</cmt>
+  <desc>5264</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.457760973" lon="-71.121044951">
+  <name>526708</name>
+  <cmt>526708</cmt>
+  <desc>526708</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.457088996" lon="-71.120312959">
+  <name>526750</name>
+  <cmt>526750</cmt>
+  <desc>526750</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.457387811" lon="-71.119844830">
+  <name>5267OBSTAC</name>
+  <cmt>Obstacle</cmt>
+  <desc>Obstacle</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.456591949" lon="-71.119675767">
+  <name>527614</name>
+  <cmt>527614</cmt>
+  <desc>527614</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.456251979" lon="-71.119355829">
+  <name>527631</name>
+  <cmt>527631</cmt>
+  <desc>527631</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.458147882" lon="-71.119134799">
+  <name>5278</name>
+  <cmt>5278</cmt>
+  <desc>5278</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.458781973" lon="-71.118990798">
+  <name>5278ROAD</name>
+  <cmt>Road</cmt>
+  <desc>Road</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.457733816" lon="-71.117480882">
+  <name>5287WATER</name>
+  <cmt>Reservoir</cmt>
+  <desc>Reservoir</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459376752" lon="-71.117692944">
+  <name>5289</name>
+  <cmt>5289</cmt>
+  <desc>5289</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459628964" lon="-71.116523920">
+  <name>5299DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.464182936" lon="-71.119827814">
+  <name>5374FIRE</name>
+  <cmt>5374FIRE</cmt>
+  <desc>5374FIRE</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.465649853" lon="-71.119398829">
+  <name>5376</name>
+  <cmt>5376</cmt>
+  <desc>5376</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.465758985" lon="-71.119814822">
+  <name>5376BRIDGE</name>
+  <cmt>Bridge</cmt>
+  <desc>Bridge</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.465484897" lon="-71.119147791">
+  <name>5376DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.465912877" lon="-71.119327918">
+  <name>5376STREAM</name>
+  <cmt>Stream Crossing</cmt>
+  <desc>Stream Crossing</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.439017948" lon="-71.114455853">
+  <name>6006</name>
+  <cmt>600698</cmt>
+  <desc>600698</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.438593823" lon="-71.114802780">
+  <name>6006BLUE</name>
+  <cmt>6006BLUE</cmt>
+  <desc>6006BLUE</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.436756846" lon="-71.113222959">
+  <name>6014MEADOW</name>
+  <cmt>6014MEADOW</cmt>
+  <desc>6014MEADOW</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.438665992" lon="-71.114078835">
+  <name>6016</name>
+  <cmt>Bike Loop Connector</cmt>
+  <desc>Bike Loop Connector</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.441753969" lon="-71.113219773">
+  <name>6029</name>
+  <cmt>6029</cmt>
+  <desc>6029</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.435471984" lon="-71.109663919">
+  <name>6042CROSS</name>
+  <cmt>Crossing</cmt>
+  <desc>Crossing</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.436242783" lon="-71.109074755">
+  <name>6053</name>
+  <cmt>6053</cmt>
+  <desc>6053</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.439249959" lon="-71.107499963">
+  <name>6066</name>
+  <cmt>6066</cmt>
+  <desc>6066</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.439763770" lon="-71.107581938">
+  <name>6067</name>
+  <cmt>6067</cmt>
+  <desc>6067</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.434765976" lon="-71.105873790">
+  <name>6071</name>
+  <cmt>6071</cmt>
+  <desc>6071</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.433303921" lon="-71.106598992">
+  <name>6073</name>
+  <cmt>6073</cmt>
+  <desc>6073</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.439501919" lon="-71.106555993">
+  <name>6077LOGS</name>
+  <cmt>Log Crossing</cmt>
+  <desc>Log Crossing</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.437337963" lon="-71.104771905">
+  <name>6084</name>
+  <cmt>6084</cmt>
+  <desc>6084</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.443108819" lon="-71.112674950">
+  <name>6121DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.442195863" lon="-71.110974764">
+  <name>6130</name>
+  <cmt>6130</cmt>
+  <desc>6130</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.442980912" lon="-71.111440966">
+  <name>6131</name>
+  <cmt>6131</cmt>
+  <desc>6131</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.444772879" lon="-71.108881971">
+  <name>6153</name>
+  <cmt>6153</cmt>
+  <desc>6153</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.446792834" lon="-71.108783903">
+  <name>6155DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.443591869" lon="-71.106300848">
+  <name>6171</name>
+  <cmt>6171</cmt>
+  <desc>6171</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.447803859" lon="-71.106623970">
+  <name>6176</name>
+  <cmt>6176</cmt>
+  <desc>6176</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.448447756" lon="-71.106157769">
+  <name>6177</name>
+  <cmt>6177</cmt>
+  <desc>6177</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.442992982" lon="-71.105877981">
+  <name>6181CROSS</name>
+  <cmt>Crossing</cmt>
+  <desc>Crossing</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.453414788" lon="-71.106782975">
+  <name>6272</name>
+  <cmt>6272</cmt>
+  <desc>6272</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.453433815" lon="-71.107252948">
+  <name>6272.1</name>
+  <cmt>6272</cmt>
+  <desc>6272</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.458297918" lon="-71.106770989">
+  <name>6278</name>
+  <cmt>6278</cmt>
+  <desc>6278</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.451429954" lon="-71.105412953">
+  <name>6280</name>
+  <cmt>6280</cmt>
+  <desc>6280</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.453844948" lon="-71.105205920">
+  <name>6283</name>
+  <cmt>6283</cmt>
+  <desc>6283</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459985781" lon="-71.106169755">
+  <name>6289</name>
+  <cmt>6289</cmt>
+  <desc>6289</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.457615966" lon="-71.105115982">
+  <name>6297</name>
+  <cmt>6297</cmt>
+  <desc>6297</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.467109812" lon="-71.113573993">
+  <name>6328</name>
+  <cmt>6328</cmt>
+  <desc>6328</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.462775866" lon="-71.109985868">
+  <name>6353DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.464201963" lon="-71.109862989">
+  <name>6354</name>
+  <cmt>6354</cmt>
+  <desc>6354</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.466458958" lon="-71.110066921">
+  <name>635722</name>
+  <cmt>635722</cmt>
+  <desc>635722</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.466556774" lon="-71.109409947">
+  <name>635783</name>
+  <cmt>635783</cmt>
+  <desc>635783</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.463494781" lon="-71.107116994">
+  <name>6373</name>
+  <cmt>6373</cmt>
+  <desc>6373</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.401050944" lon="-71.110240929">
+  <name>6634</name>
+  <cmt>6634</cmt>
+  <desc>6634</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.432620795" lon="-71.106531937">
+  <name>6979</name>
+  <cmt>6979</cmt>
+  <desc>6979</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.431032928" lon="-71.107882932">
+  <name>6997</name>
+  <cmt>6997</cmt>
+  <desc>6997</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.465686901" lon="-71.107359985">
+  <name>BEAR HILL</name>
+  <cmt>BEAR HILL TOWER</cmt>
+  <desc>BEAR HILL TOWER</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.430949947" lon="-71.107627871">
+  <name>BELLEVUE</name>
+  <cmt>BELLEVUE</cmt>
+  <desc>BELLEVUE</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.458515931" lon="-71.103645964">
+  <name>DARKHOLLPO</name>
+  <cmt>Dark Hollow Pond</cmt>
+  <desc>Dark Hollow Pond</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.451203978" lon="-71.126601985">
+  <name>GATE14</name>
+  <cmt>Gate 14</cmt>
+  <desc>Gate 14</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.458498916" lon="-71.122077769">
+  <name>GATE16</name>
+  <cmt>Gate 16</cmt>
+  <desc>Gate 16</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459375830" lon="-71.119237980">
+  <name>GATE17</name>
+  <cmt>Gate 17</cmt>
+  <desc>Gate 17</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.466352927" lon="-71.119239992">
+  <name>GATE19</name>
+  <cmt>Gate 19</cmt>
+  <desc>Gate 19</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.468654849" lon="-71.107696854">
+  <name>GATE21</name>
+  <cmt>Gate 21</cmt>
+  <desc>Gate 21</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.456717929" lon="-71.102972981">
+  <name>GATE24</name>
+  <cmt>Gate 24</cmt>
+  <desc>Gate 24</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.430846766" lon="-71.107689897">
+  <name>GATE5</name>
+  <cmt>Gate 5</cmt>
+  <desc>Gate 5</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.431239961" lon="-71.109235939">
+  <name>GATE6</name>
+  <cmt>Gate 6</cmt>
+  <desc>Gate 6</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.434979966" lon="-71.109941863">
+  <name>PANTHRCAVE</name>
+  <cmt>Panther Cave</cmt>
+  <desc>Panther Cave</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.453414788" lon="-71.106781969">
+  <name>SHEEPFOLD</name>
+  <cmt>Sheepfold Parking Lot</cmt>
+  <desc>Sheepfold Parking Lot</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.455955762" lon="-71.107482864">
+  <name>SOAPBOX</name>
+  <cmt>Soap Box Derby Track</cmt>
+  <desc>Soap Box Derby Track</desc>
+  <sym>Waypoint</sym>
+</wpt>
+</gpx>

diff --git a/reference/garmin_gpi2.gpx b/reference/garmin_gpi2.gpx
new file mode 100644 (file)
index 0000000..1c5718a
--- /dev/null
+++ b/reference/garmin_gpi2.gpx
@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx
+ version="1.0"
+creator="GPSBabel - http://www.gpsbabel.org"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://www.topografix.com/GPX/1/0"
+xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
+<time>1970-01-01T00:00:00Z</time>
+<bounds minlat="42.401050944" minlon="-71.126601985" maxlat="42.468654849" maxlon="-71.102972981"/>
+<wpt lat="42.439992931" lon="-71.120924922">
+  <name>5058ROAD</name>
+  <cmt>ROAD CROSSING</cmt>
+  <desc>ROAD CROSSING</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.438877970" lon="-71.119276956">
+  <name>5066</name>
+  <cmt>5066</cmt>
+  <desc>5066</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.439226909" lon="-71.119688759">
+  <name>5067</name>
+  <cmt>5067</cmt>
+  <desc>5067</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.438916946" lon="-71.116145980">
+  <name>5096</name>
+  <cmt>5096</cmt>
+  <desc>5096</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.443903927" lon="-71.122043990">
+  <name>5142</name>
+  <cmt>5142</cmt>
+  <desc>5142</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.445358858" lon="-71.122844797">
+  <name>5144SUMMIT</name>
+  <cmt>Summit</cmt>
+  <desc>Summit</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.449764973" lon="-71.122319922">
+  <name>5148NANEPA</name>
+  <cmt>Nanepashemet Road Crossing</cmt>
+  <desc>Nanepashemet Road Crossing</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.441726979" lon="-71.121675773">
+  <name>5150TANK</name>
+  <cmt>WATER TANK</cmt>
+  <desc>WATER TANK</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.447297927" lon="-71.121446947">
+  <name>5156</name>
+  <cmt>5156</cmt>
+  <desc>5156</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.449865891" lon="-71.119297827">
+  <name>5179DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.454872821" lon="-71.125093997">
+  <name>5224</name>
+  <cmt>5224</cmt>
+  <desc>5224</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459078860" lon="-71.124987882">
+  <name>5229</name>
+  <cmt>5229</cmt>
+  <desc>5229</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.456468903" lon="-71.124650678">
+  <name>5236BRIDGE</name>
+  <cmt>Bridge</cmt>
+  <desc>Bridge</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.456978858" lon="-71.124473820">
+  <name>5237</name>
+  <cmt>5237</cmt>
+  <desc>5237</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459277930" lon="-71.124573816">
+  <name>5239ROAD</name>
+  <cmt>Road</cmt>
+  <desc>Road</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.453255868" lon="-71.121210745">
+  <name>5252PURPLE</name>
+  <cmt>Purple Rock Hill</cmt>
+  <desc>Purple Rock Hill</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.454400836" lon="-71.120989798">
+  <name>5254</name>
+  <cmt>5254</cmt>
+  <desc>5254</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.451441940" lon="-71.121745678">
+  <name>5258</name>
+  <cmt>5258</cmt>
+  <desc>5258</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.454403937" lon="-71.120659970">
+  <name>5264</name>
+  <cmt>5264</cmt>
+  <desc>5264</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.457760973" lon="-71.121044951">
+  <name>526708</name>
+  <cmt>526708</cmt>
+  <desc>526708</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.457088996" lon="-71.120312959">
+  <name>526750</name>
+  <cmt>526750</cmt>
+  <desc>526750</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.457387811" lon="-71.119844830">
+  <name>5267OBSTAC</name>
+  <cmt>Obstacle</cmt>
+  <desc>Obstacle</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.456591949" lon="-71.119675767">
+  <name>527614</name>
+  <cmt>527614</cmt>
+  <desc>527614</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.456251979" lon="-71.119355746">
+  <name>527631</name>
+  <cmt>527631</cmt>
+  <desc>527631</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.458147882" lon="-71.119134799">
+  <name>5278</name>
+  <cmt>5278</cmt>
+  <desc>5278</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.458781973" lon="-71.118990798">
+  <name>5278ROAD</name>
+  <cmt>Road</cmt>
+  <desc>Road</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.457733816" lon="-71.117480882">
+  <name>5287WATER</name>
+  <cmt>Reservoir</cmt>
+  <desc>Reservoir</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459376669" lon="-71.117692944">
+  <name>5289</name>
+  <cmt>5289</cmt>
+  <desc>5289</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459628964" lon="-71.116523920">
+  <name>5299DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.464182936" lon="-71.119827731">
+  <name>5374FIRE</name>
+  <cmt>5374FIRE</cmt>
+  <desc>5374FIRE</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.465649853" lon="-71.119398829">
+  <name>5376</name>
+  <cmt>5376</cmt>
+  <desc>5376</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.465758985" lon="-71.119814739">
+  <name>5376BRIDGE</name>
+  <cmt>Bridge</cmt>
+  <desc>Bridge</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.465484897" lon="-71.119147791">
+  <name>5376DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.465912877" lon="-71.119327918">
+  <name>5376STREAM</name>
+  <cmt>Stream Crossing</cmt>
+  <desc>Stream Crossing</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.439017948" lon="-71.114455853">
+  <name>6006</name>
+  <cmt>600698</cmt>
+  <desc>600698</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.438593740" lon="-71.114802780">
+  <name>6006BLUE</name>
+  <cmt>6006BLUE</cmt>
+  <desc>6006BLUE</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.436756846" lon="-71.113222959">
+  <name>6014MEADOW</name>
+  <cmt>6014MEADOW</cmt>
+  <desc>6014MEADOW</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.438665992" lon="-71.114078835">
+  <name>6016</name>
+  <cmt>Bike Loop Connector</cmt>
+  <desc>Bike Loop Connector</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.441753969" lon="-71.113219690">
+  <name>6029</name>
+  <cmt>6029</cmt>
+  <desc>6029</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.435471984" lon="-71.109663919">
+  <name>6042CROSS</name>
+  <cmt>Crossing</cmt>
+  <desc>Crossing</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.436242700" lon="-71.109074755">
+  <name>6053</name>
+  <cmt>6053</cmt>
+  <desc>6053</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.439249959" lon="-71.107499963">
+  <name>6066</name>
+  <cmt>6066</cmt>
+  <desc>6066</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.439763770" lon="-71.107581938">
+  <name>6067</name>
+  <cmt>6067</cmt>
+  <desc>6067</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.434765976" lon="-71.105873790">
+  <name>6071</name>
+  <cmt>6071</cmt>
+  <desc>6071</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.433303921" lon="-71.106598992">
+  <name>6073</name>
+  <cmt>6073</cmt>
+  <desc>6073</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.439501919" lon="-71.106555993">
+  <name>6077LOGS</name>
+  <cmt>Log Crossing</cmt>
+  <desc>Log Crossing</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.437337963" lon="-71.104771905">
+  <name>6084</name>
+  <cmt>6084</cmt>
+  <desc>6084</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.443108736" lon="-71.112674950">
+  <name>6121DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.442195863" lon="-71.110974681">
+  <name>6130</name>
+  <cmt>6130</cmt>
+  <desc>6130</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.442980912" lon="-71.111440966">
+  <name>6131</name>
+  <cmt>6131</cmt>
+  <desc>6131</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.444772879" lon="-71.108881971">
+  <name>6153</name>
+  <cmt>6153</cmt>
+  <desc>6153</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.446792834" lon="-71.108783903">
+  <name>6155DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.443591869" lon="-71.106300848">
+  <name>6171</name>
+  <cmt>6171</cmt>
+  <desc>6171</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.447803859" lon="-71.106623970">
+  <name>6176</name>
+  <cmt>6176</cmt>
+  <desc>6176</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.448447673" lon="-71.106157769">
+  <name>6177</name>
+  <cmt>6177</cmt>
+  <desc>6177</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.442992982" lon="-71.105877981">
+  <name>6181CROSS</name>
+  <cmt>Crossing</cmt>
+  <desc>Crossing</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.453414705" lon="-71.106782975">
+  <name>6272</name>
+  <cmt>6272</cmt>
+  <desc>6272</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.453433732" lon="-71.107252948">
+  <name>6272.1</name>
+  <cmt>6272</cmt>
+  <desc>6272</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.458297918" lon="-71.106770989">
+  <name>6278</name>
+  <cmt>6278</cmt>
+  <desc>6278</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.451429954" lon="-71.105412953">
+  <name>6280</name>
+  <cmt>6280</cmt>
+  <desc>6280</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.453844948" lon="-71.105205920">
+  <name>6283</name>
+  <cmt>6283</cmt>
+  <desc>6283</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459985698" lon="-71.106169755">
+  <name>6289</name>
+  <cmt>6289</cmt>
+  <desc>6289</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.457615966" lon="-71.105115982">
+  <name>6297</name>
+  <cmt>6297</cmt>
+  <desc>6297</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.467109729" lon="-71.113573993">
+  <name>6328</name>
+  <cmt>6328</cmt>
+  <desc>6328</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.462775866" lon="-71.109985868">
+  <name>6353DEAD</name>
+  <cmt>Dead End</cmt>
+  <desc>Dead End</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.464201963" lon="-71.109862989">
+  <name>6354</name>
+  <cmt>6354</cmt>
+  <desc>6354</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.466458958" lon="-71.110066921">
+  <name>635722</name>
+  <cmt>635722</cmt>
+  <desc>635722</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.466556691" lon="-71.109409947">
+  <name>635783</name>
+  <cmt>635783</cmt>
+  <desc>635783</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.463494698" lon="-71.107116994">
+  <name>6373</name>
+  <cmt>6373</cmt>
+  <desc>6373</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.401050944" lon="-71.110240929">
+  <name>6634</name>
+  <cmt>6634</cmt>
+  <desc>6634</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.432620712" lon="-71.106531937">
+  <name>6979</name>
+  <cmt>6979</cmt>
+  <desc>6979</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.431032928" lon="-71.107882932">
+  <name>6997</name>
+  <cmt>6997</cmt>
+  <desc>6997</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.465686901" lon="-71.107359985">
+  <name>BEAR HILL</name>
+  <cmt>BEAR HILL TOWER</cmt>
+  <desc>BEAR HILL TOWER</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.430949947" lon="-71.107627871">
+  <name>BELLEVUE</name>
+  <cmt>BELLEVUE</cmt>
+  <desc>BELLEVUE</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.458515931" lon="-71.103645964">
+  <name>DARKHOLLPO</name>
+  <cmt>Dark Hollow Pond</cmt>
+  <desc>Dark Hollow Pond</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.451203978" lon="-71.126601985">
+  <name>GATE14</name>
+  <cmt>Gate 14</cmt>
+  <desc>Gate 14</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.458498916" lon="-71.122077769">
+  <name>GATE16</name>
+  <cmt>Gate 16</cmt>
+  <desc>Gate 16</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.459375747" lon="-71.119237980">
+  <name>GATE17</name>
+  <cmt>Gate 17</cmt>
+  <desc>Gate 17</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.466352927" lon="-71.119239992">
+  <name>GATE19</name>
+  <cmt>Gate 19</cmt>
+  <desc>Gate 19</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.468654849" lon="-71.107696854">
+  <name>GATE21</name>
+  <cmt>Gate 21</cmt>
+  <desc>Gate 21</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.456717929" lon="-71.102972981">
+  <name>GATE24</name>
+  <cmt>Gate 24</cmt>
+  <desc>Gate 24</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.430846766" lon="-71.107689897">
+  <name>GATE5</name>
+  <cmt>Gate 5</cmt>
+  <desc>Gate 5</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.431239961" lon="-71.109235939">
+  <name>GATE6</name>
+  <cmt>Gate 6</cmt>
+  <desc>Gate 6</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.434979966" lon="-71.109941863">
+  <name>PANTHRCAVE</name>
+  <cmt>Panther Cave</cmt>
+  <desc>Panther Cave</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.453414705" lon="-71.106781969">
+  <name>SHEEPFOLD</name>
+  <cmt>Sheepfold Parking Lot</cmt>
+  <desc>Sheepfold Parking Lot</desc>
+  <sym>Waypoint</sym>
+</wpt>
+<wpt lat="42.455955679" lon="-71.107482864">
+  <name>SOAPBOX</name>
+  <cmt>Soap Box Derby Track</cmt>
+  <desc>Soap Box Derby Track</desc>
+  <sym>Waypoint</sym>
+</wpt>
+</gpx>

diff --git a/reference/garmin_poi.gpi b/reference/garmin_poi.gpi
deleted file mode 100644 (file)
index 290d892..0000000
Binary files a/reference/garmin_poi.gpi and /dev/null differ

diff --git a/reference/garmin_poi.gpx b/reference/garmin_poi.gpx
deleted file mode 100644 (file)
index 2424b5d..0000000
--- a/reference/garmin_poi.gpx
+++ /dev/null
@@ -1,526 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gpx
- version="1.0"
-creator="GPSBabel - http://www.gpsbabel.org"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns="http://www.topografix.com/GPX/1/0"
-xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
-<time>1970-01-01T00:00:00Z</time>
-<bounds minlat="42.401050944" minlon="-71.126601985" maxlat="42.468654849" maxlon="-71.102972981"/>
-<wpt lat="42.439992931" lon="-71.120924922">
-  <name>5058ROAD</name>
-  <cmt>ROAD CROSSING</cmt>
-  <desc>ROAD CROSSING</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.438877970" lon="-71.119276956">
-  <name>5066</name>
-  <cmt>5066</cmt>
-  <desc>5066</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.439226909" lon="-71.119688759">
-  <name>5067</name>
-  <cmt>5067</cmt>
-  <desc>5067</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.438916946" lon="-71.116145980">
-  <name>5096</name>
-  <cmt>5096</cmt>
-  <desc>5096</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.443903927" lon="-71.122043990">
-  <name>5142</name>
-  <cmt>5142</cmt>
-  <desc>5142</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.445358858" lon="-71.122844797">
-  <name>5144SUMMIT</name>
-  <cmt>Summit</cmt>
-  <desc>Summit</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.449764973" lon="-71.122319922">
-  <name>5148NANEPA</name>
-  <cmt>Nanepashemet Road Crossing</cmt>
-  <desc>Nanepashemet Road Crossing</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.441726979" lon="-71.121675773">
-  <name>5150TANK</name>
-  <cmt>WATER TANK</cmt>
-  <desc>WATER TANK</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.447297927" lon="-71.121446947">
-  <name>5156</name>
-  <cmt>5156</cmt>
-  <desc>5156</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.449865891" lon="-71.119297827">
-  <name>5179DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.454872821" lon="-71.125093997">
-  <name>5224</name>
-  <cmt>5224</cmt>
-  <desc>5224</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459078860" lon="-71.124987882">
-  <name>5229</name>
-  <cmt>5229</cmt>
-  <desc>5229</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.456468903" lon="-71.124650761">
-  <name>5236BRIDGE</name>
-  <cmt>Bridge</cmt>
-  <desc>Bridge</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.456978858" lon="-71.124473820">
-  <name>5237</name>
-  <cmt>5237</cmt>
-  <desc>5237</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459277930" lon="-71.124573816">
-  <name>5239ROAD</name>
-  <cmt>Road</cmt>
-  <desc>Road</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.453255868" lon="-71.121210828">
-  <name>5252PURPLE</name>
-  <cmt>Purple Rock Hill</cmt>
-  <desc>Purple Rock Hill</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.454400836" lon="-71.120989798">
-  <name>5254</name>
-  <cmt>5254</cmt>
-  <desc>5254</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.451441940" lon="-71.121745761">
-  <name>5258</name>
-  <cmt>5258</cmt>
-  <desc>5258</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.454403937" lon="-71.120659970">
-  <name>5264</name>
-  <cmt>5264</cmt>
-  <desc>5264</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.457760973" lon="-71.121044951">
-  <name>526708</name>
-  <cmt>526708</cmt>
-  <desc>526708</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.457088996" lon="-71.120312959">
-  <name>526750</name>
-  <cmt>526750</cmt>
-  <desc>526750</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.457387811" lon="-71.119844830">
-  <name>5267OBSTAC</name>
-  <cmt>Obstacle</cmt>
-  <desc>Obstacle</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.456591949" lon="-71.119675767">
-  <name>527614</name>
-  <cmt>527614</cmt>
-  <desc>527614</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.456251979" lon="-71.119355829">
-  <name>527631</name>
-  <cmt>527631</cmt>
-  <desc>527631</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.458147882" lon="-71.119134799">
-  <name>5278</name>
-  <cmt>5278</cmt>
-  <desc>5278</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.458781973" lon="-71.118990798">
-  <name>5278ROAD</name>
-  <cmt>Road</cmt>
-  <desc>Road</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.457733816" lon="-71.117480882">
-  <name>5287WATER</name>
-  <cmt>Reservoir</cmt>
-  <desc>Reservoir</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459376752" lon="-71.117692944">
-  <name>5289</name>
-  <cmt>5289</cmt>
-  <desc>5289</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459628964" lon="-71.116523920">
-  <name>5299DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.464182936" lon="-71.119827814">
-  <name>5374FIRE</name>
-  <cmt>5374FIRE</cmt>
-  <desc>5374FIRE</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.465649853" lon="-71.119398829">
-  <name>5376</name>
-  <cmt>5376</cmt>
-  <desc>5376</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.465758985" lon="-71.119814822">
-  <name>5376BRIDGE</name>
-  <cmt>Bridge</cmt>
-  <desc>Bridge</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.465484897" lon="-71.119147791">
-  <name>5376DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.465912877" lon="-71.119327918">
-  <name>5376STREAM</name>
-  <cmt>Stream Crossing</cmt>
-  <desc>Stream Crossing</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.439017948" lon="-71.114455853">
-  <name>6006</name>
-  <cmt>600698</cmt>
-  <desc>600698</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.438593823" lon="-71.114802780">
-  <name>6006BLUE</name>
-  <cmt>6006BLUE</cmt>
-  <desc>6006BLUE</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.436756846" lon="-71.113222959">
-  <name>6014MEADOW</name>
-  <cmt>6014MEADOW</cmt>
-  <desc>6014MEADOW</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.438665992" lon="-71.114078835">
-  <name>6016</name>
-  <cmt>Bike Loop Connector</cmt>
-  <desc>Bike Loop Connector</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.441753969" lon="-71.113219773">
-  <name>6029</name>
-  <cmt>6029</cmt>
-  <desc>6029</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.435471984" lon="-71.109663919">
-  <name>6042CROSS</name>
-  <cmt>Crossing</cmt>
-  <desc>Crossing</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.436242783" lon="-71.109074755">
-  <name>6053</name>
-  <cmt>6053</cmt>
-  <desc>6053</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.439249959" lon="-71.107499963">
-  <name>6066</name>
-  <cmt>6066</cmt>
-  <desc>6066</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.439763770" lon="-71.107581938">
-  <name>6067</name>
-  <cmt>6067</cmt>
-  <desc>6067</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.434765976" lon="-71.105873790">
-  <name>6071</name>
-  <cmt>6071</cmt>
-  <desc>6071</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.433303921" lon="-71.106598992">
-  <name>6073</name>
-  <cmt>6073</cmt>
-  <desc>6073</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.439501919" lon="-71.106555993">
-  <name>6077LOGS</name>
-  <cmt>Log Crossing</cmt>
-  <desc>Log Crossing</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.437337963" lon="-71.104771905">
-  <name>6084</name>
-  <cmt>6084</cmt>
-  <desc>6084</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.443108819" lon="-71.112674950">
-  <name>6121DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.442195863" lon="-71.110974764">
-  <name>6130</name>
-  <cmt>6130</cmt>
-  <desc>6130</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.442980912" lon="-71.111440966">
-  <name>6131</name>
-  <cmt>6131</cmt>
-  <desc>6131</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.444772879" lon="-71.108881971">
-  <name>6153</name>
-  <cmt>6153</cmt>
-  <desc>6153</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.446792834" lon="-71.108783903">
-  <name>6155DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.443591869" lon="-71.106300848">
-  <name>6171</name>
-  <cmt>6171</cmt>
-  <desc>6171</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.447803859" lon="-71.106623970">
-  <name>6176</name>
-  <cmt>6176</cmt>
-  <desc>6176</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.448447756" lon="-71.106157769">
-  <name>6177</name>
-  <cmt>6177</cmt>
-  <desc>6177</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.442992982" lon="-71.105877981">
-  <name>6181CROSS</name>
-  <cmt>Crossing</cmt>
-  <desc>Crossing</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.453414788" lon="-71.106782975">
-  <name>6272</name>
-  <cmt>6272</cmt>
-  <desc>6272</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.453433815" lon="-71.107252948">
-  <name>6272.1</name>
-  <cmt>6272</cmt>
-  <desc>6272</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.458297918" lon="-71.106770989">
-  <name>6278</name>
-  <cmt>6278</cmt>
-  <desc>6278</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.451429954" lon="-71.105412953">
-  <name>6280</name>
-  <cmt>6280</cmt>
-  <desc>6280</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.453844948" lon="-71.105205920">
-  <name>6283</name>
-  <cmt>6283</cmt>
-  <desc>6283</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459985781" lon="-71.106169755">
-  <name>6289</name>
-  <cmt>6289</cmt>
-  <desc>6289</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.457615966" lon="-71.105115982">
-  <name>6297</name>
-  <cmt>6297</cmt>
-  <desc>6297</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.467109812" lon="-71.113573993">
-  <name>6328</name>
-  <cmt>6328</cmt>
-  <desc>6328</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.462775866" lon="-71.109985868">
-  <name>6353DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.464201963" lon="-71.109862989">
-  <name>6354</name>
-  <cmt>6354</cmt>
-  <desc>6354</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.466458958" lon="-71.110066921">
-  <name>635722</name>
-  <cmt>635722</cmt>
-  <desc>635722</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.466556774" lon="-71.109409947">
-  <name>635783</name>
-  <cmt>635783</cmt>
-  <desc>635783</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.463494781" lon="-71.107116994">
-  <name>6373</name>
-  <cmt>6373</cmt>
-  <desc>6373</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.401050944" lon="-71.110240929">
-  <name>6634</name>
-  <cmt>6634</cmt>
-  <desc>6634</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.432620795" lon="-71.106531937">
-  <name>6979</name>
-  <cmt>6979</cmt>
-  <desc>6979</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.431032928" lon="-71.107882932">
-  <name>6997</name>
-  <cmt>6997</cmt>
-  <desc>6997</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.465686901" lon="-71.107359985">
-  <name>BEAR HILL</name>
-  <cmt>BEAR HILL TOWER</cmt>
-  <desc>BEAR HILL TOWER</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.430949947" lon="-71.107627871">
-  <name>BELLEVUE</name>
-  <cmt>BELLEVUE</cmt>
-  <desc>BELLEVUE</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.458515931" lon="-71.103645964">
-  <name>DARKHOLLPO</name>
-  <cmt>Dark Hollow Pond</cmt>
-  <desc>Dark Hollow Pond</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.451203978" lon="-71.126601985">
-  <name>GATE14</name>
-  <cmt>Gate 14</cmt>
-  <desc>Gate 14</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.458498916" lon="-71.122077769">
-  <name>GATE16</name>
-  <cmt>Gate 16</cmt>
-  <desc>Gate 16</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459375830" lon="-71.119237980">
-  <name>GATE17</name>
-  <cmt>Gate 17</cmt>
-  <desc>Gate 17</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.466352927" lon="-71.119239992">
-  <name>GATE19</name>
-  <cmt>Gate 19</cmt>
-  <desc>Gate 19</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.468654849" lon="-71.107696854">
-  <name>GATE21</name>
-  <cmt>Gate 21</cmt>
-  <desc>Gate 21</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.456717929" lon="-71.102972981">
-  <name>GATE24</name>
-  <cmt>Gate 24</cmt>
-  <desc>Gate 24</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.430846766" lon="-71.107689897">
-  <name>GATE5</name>
-  <cmt>Gate 5</cmt>
-  <desc>Gate 5</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.431239961" lon="-71.109235939">
-  <name>GATE6</name>
-  <cmt>Gate 6</cmt>
-  <desc>Gate 6</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.434979966" lon="-71.109941863">
-  <name>PANTHRCAVE</name>
-  <cmt>Panther Cave</cmt>
-  <desc>Panther Cave</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.453414788" lon="-71.106781969">
-  <name>SHEEPFOLD</name>
-  <cmt>Sheepfold Parking Lot</cmt>
-  <desc>Sheepfold Parking Lot</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.455955762" lon="-71.107482864">
-  <name>SOAPBOX</name>
-  <cmt>Soap Box Derby Track</cmt>
-  <desc>Soap Box Derby Track</desc>
-  <sym>Waypoint</sym>
-</wpt>
-</gpx>

diff --git a/reference/garmin_poi2.gpx b/reference/garmin_poi2.gpx
deleted file mode 100644 (file)
index 1c5718a..0000000
--- a/reference/garmin_poi2.gpx
+++ /dev/null
@@ -1,526 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gpx
- version="1.0"
-creator="GPSBabel - http://www.gpsbabel.org"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns="http://www.topografix.com/GPX/1/0"
-xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
-<time>1970-01-01T00:00:00Z</time>
-<bounds minlat="42.401050944" minlon="-71.126601985" maxlat="42.468654849" maxlon="-71.102972981"/>
-<wpt lat="42.439992931" lon="-71.120924922">
-  <name>5058ROAD</name>
-  <cmt>ROAD CROSSING</cmt>
-  <desc>ROAD CROSSING</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.438877970" lon="-71.119276956">
-  <name>5066</name>
-  <cmt>5066</cmt>
-  <desc>5066</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.439226909" lon="-71.119688759">
-  <name>5067</name>
-  <cmt>5067</cmt>
-  <desc>5067</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.438916946" lon="-71.116145980">
-  <name>5096</name>
-  <cmt>5096</cmt>
-  <desc>5096</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.443903927" lon="-71.122043990">
-  <name>5142</name>
-  <cmt>5142</cmt>
-  <desc>5142</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.445358858" lon="-71.122844797">
-  <name>5144SUMMIT</name>
-  <cmt>Summit</cmt>
-  <desc>Summit</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.449764973" lon="-71.122319922">
-  <name>5148NANEPA</name>
-  <cmt>Nanepashemet Road Crossing</cmt>
-  <desc>Nanepashemet Road Crossing</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.441726979" lon="-71.121675773">
-  <name>5150TANK</name>
-  <cmt>WATER TANK</cmt>
-  <desc>WATER TANK</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.447297927" lon="-71.121446947">
-  <name>5156</name>
-  <cmt>5156</cmt>
-  <desc>5156</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.449865891" lon="-71.119297827">
-  <name>5179DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.454872821" lon="-71.125093997">
-  <name>5224</name>
-  <cmt>5224</cmt>
-  <desc>5224</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459078860" lon="-71.124987882">
-  <name>5229</name>
-  <cmt>5229</cmt>
-  <desc>5229</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.456468903" lon="-71.124650678">
-  <name>5236BRIDGE</name>
-  <cmt>Bridge</cmt>
-  <desc>Bridge</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.456978858" lon="-71.124473820">
-  <name>5237</name>
-  <cmt>5237</cmt>
-  <desc>5237</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459277930" lon="-71.124573816">
-  <name>5239ROAD</name>
-  <cmt>Road</cmt>
-  <desc>Road</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.453255868" lon="-71.121210745">
-  <name>5252PURPLE</name>
-  <cmt>Purple Rock Hill</cmt>
-  <desc>Purple Rock Hill</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.454400836" lon="-71.120989798">
-  <name>5254</name>
-  <cmt>5254</cmt>
-  <desc>5254</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.451441940" lon="-71.121745678">
-  <name>5258</name>
-  <cmt>5258</cmt>
-  <desc>5258</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.454403937" lon="-71.120659970">
-  <name>5264</name>
-  <cmt>5264</cmt>
-  <desc>5264</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.457760973" lon="-71.121044951">
-  <name>526708</name>
-  <cmt>526708</cmt>
-  <desc>526708</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.457088996" lon="-71.120312959">
-  <name>526750</name>
-  <cmt>526750</cmt>
-  <desc>526750</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.457387811" lon="-71.119844830">
-  <name>5267OBSTAC</name>
-  <cmt>Obstacle</cmt>
-  <desc>Obstacle</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.456591949" lon="-71.119675767">
-  <name>527614</name>
-  <cmt>527614</cmt>
-  <desc>527614</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.456251979" lon="-71.119355746">
-  <name>527631</name>
-  <cmt>527631</cmt>
-  <desc>527631</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.458147882" lon="-71.119134799">
-  <name>5278</name>
-  <cmt>5278</cmt>
-  <desc>5278</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.458781973" lon="-71.118990798">
-  <name>5278ROAD</name>
-  <cmt>Road</cmt>
-  <desc>Road</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.457733816" lon="-71.117480882">
-  <name>5287WATER</name>
-  <cmt>Reservoir</cmt>
-  <desc>Reservoir</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459376669" lon="-71.117692944">
-  <name>5289</name>
-  <cmt>5289</cmt>
-  <desc>5289</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459628964" lon="-71.116523920">
-  <name>5299DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.464182936" lon="-71.119827731">
-  <name>5374FIRE</name>
-  <cmt>5374FIRE</cmt>
-  <desc>5374FIRE</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.465649853" lon="-71.119398829">
-  <name>5376</name>
-  <cmt>5376</cmt>
-  <desc>5376</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.465758985" lon="-71.119814739">
-  <name>5376BRIDGE</name>
-  <cmt>Bridge</cmt>
-  <desc>Bridge</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.465484897" lon="-71.119147791">
-  <name>5376DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.465912877" lon="-71.119327918">
-  <name>5376STREAM</name>
-  <cmt>Stream Crossing</cmt>
-  <desc>Stream Crossing</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.439017948" lon="-71.114455853">
-  <name>6006</name>
-  <cmt>600698</cmt>
-  <desc>600698</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.438593740" lon="-71.114802780">
-  <name>6006BLUE</name>
-  <cmt>6006BLUE</cmt>
-  <desc>6006BLUE</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.436756846" lon="-71.113222959">
-  <name>6014MEADOW</name>
-  <cmt>6014MEADOW</cmt>
-  <desc>6014MEADOW</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.438665992" lon="-71.114078835">
-  <name>6016</name>
-  <cmt>Bike Loop Connector</cmt>
-  <desc>Bike Loop Connector</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.441753969" lon="-71.113219690">
-  <name>6029</name>
-  <cmt>6029</cmt>
-  <desc>6029</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.435471984" lon="-71.109663919">
-  <name>6042CROSS</name>
-  <cmt>Crossing</cmt>
-  <desc>Crossing</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.436242700" lon="-71.109074755">
-  <name>6053</name>
-  <cmt>6053</cmt>
-  <desc>6053</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.439249959" lon="-71.107499963">
-  <name>6066</name>
-  <cmt>6066</cmt>
-  <desc>6066</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.439763770" lon="-71.107581938">
-  <name>6067</name>
-  <cmt>6067</cmt>
-  <desc>6067</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.434765976" lon="-71.105873790">
-  <name>6071</name>
-  <cmt>6071</cmt>
-  <desc>6071</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.433303921" lon="-71.106598992">
-  <name>6073</name>
-  <cmt>6073</cmt>
-  <desc>6073</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.439501919" lon="-71.106555993">
-  <name>6077LOGS</name>
-  <cmt>Log Crossing</cmt>
-  <desc>Log Crossing</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.437337963" lon="-71.104771905">
-  <name>6084</name>
-  <cmt>6084</cmt>
-  <desc>6084</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.443108736" lon="-71.112674950">
-  <name>6121DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.442195863" lon="-71.110974681">
-  <name>6130</name>
-  <cmt>6130</cmt>
-  <desc>6130</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.442980912" lon="-71.111440966">
-  <name>6131</name>
-  <cmt>6131</cmt>
-  <desc>6131</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.444772879" lon="-71.108881971">
-  <name>6153</name>
-  <cmt>6153</cmt>
-  <desc>6153</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.446792834" lon="-71.108783903">
-  <name>6155DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.443591869" lon="-71.106300848">
-  <name>6171</name>
-  <cmt>6171</cmt>
-  <desc>6171</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.447803859" lon="-71.106623970">
-  <name>6176</name>
-  <cmt>6176</cmt>
-  <desc>6176</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.448447673" lon="-71.106157769">
-  <name>6177</name>
-  <cmt>6177</cmt>
-  <desc>6177</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.442992982" lon="-71.105877981">
-  <name>6181CROSS</name>
-  <cmt>Crossing</cmt>
-  <desc>Crossing</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.453414705" lon="-71.106782975">
-  <name>6272</name>
-  <cmt>6272</cmt>
-  <desc>6272</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.453433732" lon="-71.107252948">
-  <name>6272.1</name>
-  <cmt>6272</cmt>
-  <desc>6272</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.458297918" lon="-71.106770989">
-  <name>6278</name>
-  <cmt>6278</cmt>
-  <desc>6278</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.451429954" lon="-71.105412953">
-  <name>6280</name>
-  <cmt>6280</cmt>
-  <desc>6280</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.453844948" lon="-71.105205920">
-  <name>6283</name>
-  <cmt>6283</cmt>
-  <desc>6283</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459985698" lon="-71.106169755">
-  <name>6289</name>
-  <cmt>6289</cmt>
-  <desc>6289</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.457615966" lon="-71.105115982">
-  <name>6297</name>
-  <cmt>6297</cmt>
-  <desc>6297</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.467109729" lon="-71.113573993">
-  <name>6328</name>
-  <cmt>6328</cmt>
-  <desc>6328</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.462775866" lon="-71.109985868">
-  <name>6353DEAD</name>
-  <cmt>Dead End</cmt>
-  <desc>Dead End</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.464201963" lon="-71.109862989">
-  <name>6354</name>
-  <cmt>6354</cmt>
-  <desc>6354</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.466458958" lon="-71.110066921">
-  <name>635722</name>
-  <cmt>635722</cmt>
-  <desc>635722</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.466556691" lon="-71.109409947">
-  <name>635783</name>
-  <cmt>635783</cmt>
-  <desc>635783</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.463494698" lon="-71.107116994">
-  <name>6373</name>
-  <cmt>6373</cmt>
-  <desc>6373</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.401050944" lon="-71.110240929">
-  <name>6634</name>
-  <cmt>6634</cmt>
-  <desc>6634</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.432620712" lon="-71.106531937">
-  <name>6979</name>
-  <cmt>6979</cmt>
-  <desc>6979</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.431032928" lon="-71.107882932">
-  <name>6997</name>
-  <cmt>6997</cmt>
-  <desc>6997</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.465686901" lon="-71.107359985">
-  <name>BEAR HILL</name>
-  <cmt>BEAR HILL TOWER</cmt>
-  <desc>BEAR HILL TOWER</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.430949947" lon="-71.107627871">
-  <name>BELLEVUE</name>
-  <cmt>BELLEVUE</cmt>
-  <desc>BELLEVUE</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.458515931" lon="-71.103645964">
-  <name>DARKHOLLPO</name>
-  <cmt>Dark Hollow Pond</cmt>
-  <desc>Dark Hollow Pond</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.451203978" lon="-71.126601985">
-  <name>GATE14</name>
-  <cmt>Gate 14</cmt>
-  <desc>Gate 14</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.458498916" lon="-71.122077769">
-  <name>GATE16</name>
-  <cmt>Gate 16</cmt>
-  <desc>Gate 16</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.459375747" lon="-71.119237980">
-  <name>GATE17</name>
-  <cmt>Gate 17</cmt>
-  <desc>Gate 17</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.466352927" lon="-71.119239992">
-  <name>GATE19</name>
-  <cmt>Gate 19</cmt>
-  <desc>Gate 19</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.468654849" lon="-71.107696854">
-  <name>GATE21</name>
-  <cmt>Gate 21</cmt>
-  <desc>Gate 21</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.456717929" lon="-71.102972981">
-  <name>GATE24</name>
-  <cmt>Gate 24</cmt>
-  <desc>Gate 24</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.430846766" lon="-71.107689897">
-  <name>GATE5</name>
-  <cmt>Gate 5</cmt>
-  <desc>Gate 5</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.431239961" lon="-71.109235939">
-  <name>GATE6</name>
-  <cmt>Gate 6</cmt>
-  <desc>Gate 6</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.434979966" lon="-71.109941863">
-  <name>PANTHRCAVE</name>
-  <cmt>Panther Cave</cmt>
-  <desc>Panther Cave</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.453414705" lon="-71.106781969">
-  <name>SHEEPFOLD</name>
-  <cmt>Sheepfold Parking Lot</cmt>
-  <desc>Sheepfold Parking Lot</desc>
-  <sym>Waypoint</sym>
-</wpt>
-<wpt lat="42.455955679" lon="-71.107482864">
-  <name>SOAPBOX</name>
-  <cmt>Soap Box Derby Track</cmt>
-  <desc>Soap Box Derby Track</desc>
-  <sym>Waypoint</sym>
-</wpt>
-</gpx>

diff --git a/testo b/testo
index 3bdc50732dd0c854d28f1f6298d8ff5f0ca82e64..4148684976102784360c6b4f15476f704491e6ce 100755 (executable)
--- a/testo
+++ b/testo
@@ -1229,13 +1229,13 @@ ${PNAME} -i tomtom_itn -f ${REFERENCE}/route/tomtom_itn.itn -o tomtom_itn -F ${T
 compare ${REFERENCE}/route/tomtom_itn.itn ${TMPDIR}/tomtom_itn.itn
 
 #
-# Garmin Points of Interest "garmin_poi" (.gpi)
+# Garmin Points of Interest "garmin_gpi" (.gpi)
 #
-${PNAME} -i garmin_poi -f ${REFERENCE}/garmin_poi.gpi -o gpx -F ${TMPDIR}/garmin_poi.gpx
-compare ${REFERENCE}/garmin_poi.gpx ${TMPDIR}/garmin_poi.gpx
-${PNAME} -i gpx -f ${REFERENCE}/garmin_poi.gpx -o garmin_poi -F ${TMPDIR}/garmin_poi.gpi
-${PNAME} -i garmin_poi -f ${TMPDIR}/garmin_poi.gpi -o gpx -F ${TMPDIR}/garmin_poi2.gpx
-compare ${REFERENCE}/garmin_poi2.gpx ${TMPDIR}/garmin_poi2.gpx
+${PNAME} -i garmin_gpi -f ${REFERENCE}/garmin_gpi.gpi -o gpx -F ${TMPDIR}/garmin_gpi.gpx
+compare ${REFERENCE}/garmin_gpi.gpx ${TMPDIR}/garmin_gpi.gpx
+${PNAME} -i gpx -f ${REFERENCE}/garmin_gpi.gpx -o garmin_gpi -F ${TMPDIR}/garmin_gpi.gpi
+${PNAME} -i garmin_gpi -f ${TMPDIR}/garmin_gpi.gpi -o gpx -F ${TMPDIR}/garmin_gpi2.gpx
+compare ${REFERENCE}/garmin_gpi2.gpx ${TMPDIR}/garmin_gpi2.gpx
 
 
 exit 0

diff --git a/vecs.c b/vecs.c
index bf3f5fdb9b9f8d3a2d13e78cdf5d3abdcf73862a..7819af0447af578d2de397d568633eb9c0bcc27a 100644 (file)
--- a/vecs.c
+++ b/vecs.c
@@ -117,7 +117,7 @@ extern ff_vecs_t alantrl_vecs;
 extern ff_vecs_t vitovtt_vecs;
 extern ff_vecs_t ggv_log_vecs;
 extern ff_vecs_t g7towin_vecs;
-extern ff_vecs_t garmin_poi_vecs;
+extern ff_vecs_t garmin_gpi_vecs;
 
 static
 vecs_t vec_list[] = {
@@ -655,8 +655,8 @@ vecs_t vec_list[] = {
        },
 #endif
         {
-                &garmin_poi_vecs,
-                "garmin_poi",
+                &garmin_gpi_vecs,
+                "garmin_gpi",
                 "Garmin Points of Interest (.gpi)",
                 "gpi"
         },